Change in openvpn[master]: Move get_tmp_dir to win32-util.c and error out on failure
A message that is not in the archive (sent off-list or not yet received): gerrit.1702476419000.I525ccf7872880367b248ebebb0ddc83551498042@...2715...
Attention is currently required from: flichtenheld.
Hello flichtenheld,
I'd like you to do a code review.
Please visit
http://gerrit.openvpn.net/c/openvpn/+/481?usp=email
to review the following change.
Change subject: Move get_tmp_dir to win32-util.c and error out on failure
......................................................................
Move get_tmp_dir to win32-util.c and error out on failure
Currently we only warn in get_tmp_dir fails and set o->tmp_dir to a null pointer. This will not be caught by check_file_access_chroot either since that ignores NULL pointers but other parts of OpenVPN will assume that tmp_dir is set to a non-NULL string.
Also move get_tmp_dir to ssl-utils.c to use it in unit tests.
---
M src/openvpn/options.c
M src/openvpn/win32-util.c
M src/openvpn/win32-util.h
M src/openvpn/win32.c
4 files changed, 34 insertions(+), 29 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/81/481/1
src/openvpn/options.c +9 -1
@@ -885,7 +885,15 @@#ifdef _WIN32/* On Windows, find temp dir via environment variables */ o->tmp_dir =win_get_tempdir (); -#else + +if (!o->tmp_dir) + { +/* Warn if we can't find a valid temporary directory, which should +* be unlikely. */ +msg (M_USAGE ,"Could not find a suitable temporary directory." +" (GetTempPath() failed). Consider using --tmp-dir" ); + } +#else /* ifdef _WIN32 */ /* Non-windows platforms use $TMPDIR, and if not set, default to '/tmp' */ o->tmp_dir =getenv ("TMPDIR" );if (!o->tmp_dir)
src/openvpn/win32-util.c +22 -0
@@ -147,4 +147,26 @@ }return true; } + +const char * +win_get_tempdir (void ) +{ +static char tmpdir[MAX_PATH ]; +WCHAR wtmpdir[MAX_PATH ]; + +if (!GetTempPathW (_countof (wtmpdir), wtmpdir)) + { +return NULL ; + } + +if (WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 ,NULL ,0 ,NULL ,NULL ) >sizeof (tmpdir)) + { +msg (M_WARN ,"Could not get temporary directory. Path is too long." +" Consider using --tmp-dir" ); +return NULL ; + } + +WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 , tmpdir,sizeof (tmpdir),NULL ,NULL ); +return tmpdir; +}#endif /* _WIN32 */
src/openvpn/win32-util.h +3 -0
@@ -40,5 +40,8 @@/* return true if filename is safe to be used on Windows */ bool win_safe_filename (const char *fn); +/* Find temporary directory */ +const char *win_get_tempdir (void ); +#endif /* OPENVPN_WIN32_UTIL_H */ #endif /* ifdef _WIN32 */
src/openvpn/win32.c +0 -28
@@ -1137,34 +1137,6 @@set_win_sys_path (buf, es); } - -const char * -win_get_tempdir (void ) -{ -static char tmpdir[MAX_PATH ]; -WCHAR wtmpdir[MAX_PATH ]; - -if (!GetTempPathW (_countof (wtmpdir), wtmpdir)) - { -/* Warn if we can't find a valid temporary directory, which should -* be unlikely. -*/ -msg (M_WARN ,"Could not find a suitable temporary directory." -" (GetTempPath() failed). Consider using --tmp-dir" ); -return NULL ; - } - -if (WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 ,NULL ,0 ,NULL ,NULL ) >sizeof (tmpdir)) - { -msg (M_WARN ,"Could not get temporary directory. Path is too long." -" Consider using --tmp-dir" ); -return NULL ; - } - -WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 , tmpdir,sizeof (tmpdir),NULL ,NULL ); -return tmpdir; -} -static bool win_block_dns_service (bool add,int index,const HANDLE pipe) {
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/481?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I525ccf7872880367b248ebebb0ddc83551498042
Gerrit-Change-Number: 481
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newchange
Attention is currently required from: flichtenheld.
plaisthos has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/481?usp=email )
Change subject: Move get_tmp_dir to win32-util.c and error out on failure
......................................................................
Patch Set 1:
(1 comment)
Patchset:
PS1:
Note that we will actually not be broken when tmp_dir is NULL but you end up with tmporary files being created in whatever the current directory is.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/481?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I525ccf7872880367b248ebebb0ddc83551498042
Gerrit-Change-Number: 481
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Wed, 13 Dec 2023 14:25:28 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Gerrit-MessageType: comment
Attention is currently required from: plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/481?usp=email )
Change subject: Move get_tmp_dir to win32-util.c and error out on failure
......................................................................
Patch Set 1: Code-Review-1
(2 comments)
File src/openvpn/options.c:
http://gerrit.openvpn.net/c/openvpn/+/481/comment/466d524c_f6e1e499 :
PS1, Line 891: /* Warn if we can't find a valid temporary directory, which shouldM_USAGE is not really "Warn"
File src/openvpn/win32-util.h:
http://gerrit.openvpn.net/c/openvpn/+/481/comment/14243ada_3a632f04 :
PS1, Line 44: const char *win_get_tempdir(void); corresponding removal from win32.h is missing?
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/481?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I525ccf7872880367b248ebebb0ddc83551498042
Gerrit-Change-Number: 481
Gerrit-PatchSet: 1
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Comment-Date: Wed, 13 Dec 2023 14:57:14 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, plaisthos.
Hello flichtenheld,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/481?usp=email
to look at the new patch set (#2).
The following approvals got outdated and were removed:
Code-Review-1 by flichtenheld
Change subject: Move get_tmp_dir to win32-util.c and error out on failure
......................................................................
Move get_tmp_dir to win32-util.c and error out on failure
Currently we only warn in get_tmp_dir fails and set o->tmp_dir to a null pointer. This will not be caught by check_file_access_chroot either since that ignores NULL pointers but other parts of OpenVPN will assume that tmp_dir is set to a non-NULL string.
Also move get_tmp_dir to ssl-utils.c to use it in unit tests.
---
M src/openvpn/options.c
M src/openvpn/win32-util.c
M src/openvpn/win32-util.h
M src/openvpn/win32.c
M src/openvpn/win32.h
5 files changed, 34 insertions(+), 32 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/81/481/2
src/openvpn/options.c +9 -1
@@ -885,7 +885,15 @@#ifdef _WIN32/* On Windows, find temp dir via environment variables */ o->tmp_dir =win_get_tempdir (); -#else + +if (!o->tmp_dir) + { +/* Error out if we can't find a valid temporary directory, which should +* be very unlikely. */ +msg (M_USAGE ,"Could not find a suitable temporary directory." +" (GetTempPath() failed). Consider using --tmp-dir" ); + } +#else /* ifdef _WIN32 */ /* Non-windows platforms use $TMPDIR, and if not set, default to '/tmp' */ o->tmp_dir =getenv ("TMPDIR" );if (!o->tmp_dir)
src/openvpn/win32-util.c +22 -0
@@ -147,4 +147,26 @@ }return true; } + +const char * +win_get_tempdir (void ) +{ +static char tmpdir[MAX_PATH ]; +WCHAR wtmpdir[MAX_PATH ]; + +if (!GetTempPathW (_countof (wtmpdir), wtmpdir)) + { +return NULL ; + } + +if (WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 ,NULL ,0 ,NULL ,NULL ) >sizeof (tmpdir)) + { +msg (M_WARN ,"Could not get temporary directory. Path is too long." +" Consider using --tmp-dir" ); +return NULL ; + } + +WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 , tmpdir,sizeof (tmpdir),NULL ,NULL ); +return tmpdir; +}#endif /* _WIN32 */
src/openvpn/win32-util.h +3 -0
@@ -40,5 +40,8 @@/* return true if filename is safe to be used on Windows */ bool win_safe_filename (const char *fn); +/* Find temporary directory */ +const char *win_get_tempdir (void ); +#endif /* OPENVPN_WIN32_UTIL_H */ #endif /* ifdef _WIN32 */
src/openvpn/win32.c +0 -28
@@ -1137,34 +1137,6 @@set_win_sys_path (buf, es); } - -const char * -win_get_tempdir (void ) -{ -static char tmpdir[MAX_PATH ]; -WCHAR wtmpdir[MAX_PATH ]; - -if (!GetTempPathW (_countof (wtmpdir), wtmpdir)) - { -/* Warn if we can't find a valid temporary directory, which should -* be unlikely. -*/ -msg (M_WARN ,"Could not find a suitable temporary directory." -" (GetTempPath() failed). Consider using --tmp-dir" ); -return NULL ; - } - -if (WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 ,NULL ,0 ,NULL ,NULL ) >sizeof (tmpdir)) - { -msg (M_WARN ,"Could not get temporary directory. Path is too long." -" Consider using --tmp-dir" ); -return NULL ; - } - -WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 , tmpdir,sizeof (tmpdir),NULL ,NULL ); -return tmpdir; -} -static bool win_block_dns_service (bool add,int index,const HANDLE pipe) {
src/openvpn/win32.h +0 -3
@@ -286,9 +286,6 @@/* call self in a subprocess */ void fork_to_self (const char *cmdline); -/* Find temporary directory */ -const char *win_get_tempdir (void ); -bool win_wfp_block_dns (const NET_IFINDEX index,const HANDLE msg_channel);bool win_wfp_uninit (const NET_IFINDEX index,const HANDLE msg_channel);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/481?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I525ccf7872880367b248ebebb0ddc83551498042
Gerrit-Change-Number: 481
Gerrit-PatchSet: 2
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-MessageType: newpatchset
Attention is currently required from: flichtenheld.
plaisthos has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/481?usp=email )
Change subject: Move get_tmp_dir to win32-util.c and error out on failure
......................................................................
Patch Set 2:
(2 comments)
File src/openvpn/options.c:
http://gerrit.openvpn.net/c/openvpn/+/481/comment/0aedaf28_cfeef61a :
PS1, Line 891: /* Warn if we can't find a valid temporary directory, which should
Quoted 1 line
M_USAGEis not really "Warn"
Done
File src/openvpn/win32-util.h:
http://gerrit.openvpn.net/c/openvpn/+/481/comment/fc97a5eb_3cd9a134 :
PS1, Line 44: const char *win_get_tempdir(void);
Quoted 1 line
corresponding removal from win32. […]
yes. Fixed.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/481?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I525ccf7872880367b248ebebb0ddc83551498042
Gerrit-Change-Number: 481
Gerrit-PatchSet: 2
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Tue, 02 Jan 2024 16:52:39 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: No
Comment-In-Reply-To: flichtenheld <[email protected]...>
Gerrit-MessageType: comment
Attention is currently required from: flichtenheld, plaisthos.
cron2 has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/481?usp=email )
Change subject: Move get_tmp_dir to win32-util.c and error out on failure
......................................................................
Patch Set 2: Code-Review+1
(1 comment)
Patchset:
PS2:
Looks good to me (just browsed through, not actually tested). Frank?
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/481?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I525ccf7872880367b248ebebb0ddc83551498042
Gerrit-Change-Number: 481
Gerrit-PatchSet: 2
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Attention: flichtenheld <[email protected]...>
Gerrit-Comment-Date: Sat, 06 Jan 2024 16:26:28 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: plaisthos.
flichtenheld has posted comments on this change. ( http://gerrit.openvpn.net/c/openvpn/+/481?usp=email )
Change subject: Move get_tmp_dir to win32-util.c and error out on failure
......................................................................
Patch Set 2: Code-Review+2
(1 comment)
Patchset:
PS2:
Looks good to me. I verified that this does not break the Windows client tests.
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/481?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I525ccf7872880367b248ebebb0ddc83551498042
Gerrit-Change-Number: 481
Gerrit-PatchSet: 2
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-Attention: plaisthos <[email protected]...>
Gerrit-Comment-Date: Mon, 08 Jan 2024 17:03:27 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
PATCH v2 1/1 Move get_tmp_dir to win32-util.c and error out on failure
In reply to a message not in the archiveFrom: Arne Schwabe <[email protected]...>
Currently we only warn in get_tmp_dir fails and set o->tmp_dir to a null pointer. This will not be caught by check_file_access_chroot either since that ignores NULL pointers but other parts of OpenVPN will assume that tmp_dir is set to a non-NULL string.
Also move get_tmp_dir to ssl-utils.c to use it in unit tests.
---
This change was reviewed on Gerrit and approved by at least one developer. I request to merge it to master.
Gerrit URL: https://gerrit.openvpn.net/c/openvpn/+/481
This mail reflects revision 2 of this Change. Acked-by according to Gerrit (reflected above):
Frank Lichtenheld <[email protected]...>
src/openvpn/options.c +9 -1
@@ -885,7 +885,15 @@#ifdef _WIN32/* On Windows, find temp dir via environment variables */ o->tmp_dir =win_get_tempdir (); -#else + +if (!o->tmp_dir) + { +/* Error out if we can't find a valid temporary directory, which should +* be very unlikely. */ +msg (M_USAGE ,"Could not find a suitable temporary directory." +" (GetTempPath() failed). Consider using --tmp-dir" ); + } +#else /* ifdef _WIN32 */ /* Non-windows platforms use $TMPDIR, and if not set, default to '/tmp' */ o->tmp_dir =getenv ("TMPDIR" );if (!o->tmp_dir)
src/openvpn/win32-util.c +22 -0
@@ -147,4 +147,26 @@ }return true; } + +const char * +win_get_tempdir (void ) +{ +static char tmpdir[MAX_PATH ]; +WCHAR wtmpdir[MAX_PATH ]; + +if (!GetTempPathW (_countof (wtmpdir), wtmpdir)) + { +return NULL ; + } + +if (WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 ,NULL ,0 ,NULL ,NULL ) >sizeof (tmpdir)) + { +msg (M_WARN ,"Could not get temporary directory. Path is too long." +" Consider using --tmp-dir" ); +return NULL ; + } + +WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 , tmpdir,sizeof (tmpdir),NULL ,NULL ); +return tmpdir; +}#endif /* _WIN32 */
src/openvpn/win32-util.h +3 -0
@@ -40,5 +40,8 @@/* return true if filename is safe to be used on Windows */ bool win_safe_filename (const char *fn); +/* Find temporary directory */ +const char *win_get_tempdir (void ); +#endif /* OPENVPN_WIN32_UTIL_H */ #endif /* ifdef _WIN32 */
src/openvpn/win32.c +0 -28
@@ -1137,34 +1137,6 @@set_win_sys_path (buf, es); } - -const char * -win_get_tempdir (void ) -{ -static char tmpdir[MAX_PATH ]; -WCHAR wtmpdir[MAX_PATH ]; - -if (!GetTempPathW (_countof (wtmpdir), wtmpdir)) - { -/* Warn if we can't find a valid temporary directory, which should -* be unlikely. -*/ -msg (M_WARN ,"Could not find a suitable temporary directory." -" (GetTempPath() failed). Consider using --tmp-dir" ); -return NULL ; - } - -if (WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 ,NULL ,0 ,NULL ,NULL ) >sizeof (tmpdir)) - { -msg (M_WARN ,"Could not get temporary directory. Path is too long." -" Consider using --tmp-dir" ); -return NULL ; - } - -WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 , tmpdir,sizeof (tmpdir),NULL ,NULL ); -return tmpdir; -} -static bool win_block_dns_service (bool add,int index,const HANDLE pipe) {
src/openvpn/win32.h +0 -3
@@ -286,9 +286,6 @@/* call self in a subprocess */ void fork_to_self (const char *cmdline); -/* Find temporary directory */ -const char *win_get_tempdir (void ); -bool win_wfp_block_dns (const NET_IFINDEX index,const HANDLE msg_channel);bool win_wfp_uninit (const NET_IFINDEX index,const HANDLE msg_channel);
[Openvpn-devel] [PATCH applied] Re: Move get_tmp_dir to win32-util.c and error out on failure
Mildly tested (GHA build).
Fixed "ssl-utils.c -> win32-util.c" in the commit message.
Your patch has been applied to the master branch.
commit f0a17ed8513405af0efb1df2ab2bda3956e01910
Author: Arne Schwabe Date: Mon Jan 8 18:13:49 2024 +0100
Move get_tmp_dir to win32-util.c and error out on failure
Signed-off-by: Arne Schwabe <[email protected]...>
Acked-by: Frank Lichtenheld <[email protected]...>
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg27964.html
Signed-off-by: Gert Doering <[email protected]...>--
kind regards,
Gert Doering
cron2 has uploaded a new patch set (#3) to the change originally created by plaisthos. ( http://gerrit.openvpn.net/c/openvpn/+/481?usp=email )
The following approvals got outdated and were removed:
Code-Review+1 by cron2, Code-Review+2 by flichtenheld
Change subject: Move get_tmp_dir to win32-util.c and error out on failure
......................................................................
Move get_tmp_dir to win32-util.c and error out on failure
Currently we only warn in get_tmp_dir fails and set o->tmp_dir to a null pointer. This will not be caught by check_file_access_chroot either since that ignores NULL pointers but other parts of OpenVPN will assume that tmp_dir is set to a non-NULL string.
Also move get_tmp_dir to win32-util.c to use it in unit tests.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg27964.html
---
M src/openvpn/options.c
M src/openvpn/win32-util.c
M src/openvpn/win32-util.h
M src/openvpn/win32.c
M src/openvpn/win32.h
5 files changed, 34 insertions(+), 32 deletions(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/81/481/3
src/openvpn/options.c +9 -1
@@ -885,7 +885,15 @@#ifdef _WIN32/* On Windows, find temp dir via environment variables */ o->tmp_dir =win_get_tempdir (); -#else + +if (!o->tmp_dir) + { +/* Error out if we can't find a valid temporary directory, which should +* be very unlikely. */ +msg (M_USAGE ,"Could not find a suitable temporary directory." +" (GetTempPath() failed). Consider using --tmp-dir" ); + } +#else /* ifdef _WIN32 */ /* Non-windows platforms use $TMPDIR, and if not set, default to '/tmp' */ o->tmp_dir =getenv ("TMPDIR" );if (!o->tmp_dir)
src/openvpn/win32-util.c +22 -0
@@ -147,4 +147,26 @@ }return true; } + +const char * +win_get_tempdir (void ) +{ +static char tmpdir[MAX_PATH ]; +WCHAR wtmpdir[MAX_PATH ]; + +if (!GetTempPathW (_countof (wtmpdir), wtmpdir)) + { +return NULL ; + } + +if (WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 ,NULL ,0 ,NULL ,NULL ) >sizeof (tmpdir)) + { +msg (M_WARN ,"Could not get temporary directory. Path is too long." +" Consider using --tmp-dir" ); +return NULL ; + } + +WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 , tmpdir,sizeof (tmpdir),NULL ,NULL ); +return tmpdir; +}#endif /* _WIN32 */
src/openvpn/win32-util.h +3 -0
@@ -40,5 +40,8 @@/* return true if filename is safe to be used on Windows */ bool win_safe_filename (const char *fn); +/* Find temporary directory */ +const char *win_get_tempdir (void ); +#endif /* OPENVPN_WIN32_UTIL_H */ #endif /* ifdef _WIN32 */
src/openvpn/win32.c +0 -28
@@ -1137,34 +1137,6 @@set_win_sys_path (buf, es); } - -const char * -win_get_tempdir (void ) -{ -static char tmpdir[MAX_PATH ]; -WCHAR wtmpdir[MAX_PATH ]; - -if (!GetTempPathW (_countof (wtmpdir), wtmpdir)) - { -/* Warn if we can't find a valid temporary directory, which should -* be unlikely. -*/ -msg (M_WARN ,"Could not find a suitable temporary directory." -" (GetTempPath() failed). Consider using --tmp-dir" ); -return NULL ; - } - -if (WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 ,NULL ,0 ,NULL ,NULL ) >sizeof (tmpdir)) - { -msg (M_WARN ,"Could not get temporary directory. Path is too long." -" Consider using --tmp-dir" ); -return NULL ; - } - -WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 , tmpdir,sizeof (tmpdir),NULL ,NULL ); -return tmpdir; -} -static bool win_block_dns_service (bool add,int index,const HANDLE pipe) {
src/openvpn/win32.h +0 -3
@@ -286,9 +286,6 @@/* call self in a subprocess */ void fork_to_self (const char *cmdline); -/* Find temporary directory */ -const char *win_get_tempdir (void ); -bool win_wfp_block_dns (const NET_IFINDEX index,const HANDLE msg_channel);bool win_wfp_uninit (const NET_IFINDEX index,const HANDLE msg_channel);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/481?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I525ccf7872880367b248ebebb0ddc83551498042
Gerrit-Change-Number: 481
Gerrit-PatchSet: 3
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: newpatchset
cron2 has submitted this change. ( http://gerrit.openvpn.net/c/openvpn/+/481?usp=email )
Change subject: Move get_tmp_dir to win32-util.c and error out on failure
......................................................................
Move get_tmp_dir to win32-util.c and error out on failure
Currently we only warn in get_tmp_dir fails and set o->tmp_dir to a null pointer. This will not be caught by check_file_access_chroot either since that ignores NULL pointers but other parts of OpenVPN will assume that tmp_dir is set to a non-NULL string.
Also move get_tmp_dir to win32-util.c to use it in unit tests.
Message-Id: <[email protected]...>
URL: https://www.mail-archive.com/[email protected]/msg27964.html
---
M src/openvpn/options.c
M src/openvpn/win32-util.c
M src/openvpn/win32-util.h
M src/openvpn/win32.c
M src/openvpn/win32.h
5 files changed, 34 insertions(+), 32 deletions(-)
src/openvpn/options.c +9 -1
@@ -885,7 +885,15 @@#ifdef _WIN32/* On Windows, find temp dir via environment variables */ o->tmp_dir =win_get_tempdir (); -#else + +if (!o->tmp_dir) + { +/* Error out if we can't find a valid temporary directory, which should +* be very unlikely. */ +msg (M_USAGE ,"Could not find a suitable temporary directory." +" (GetTempPath() failed). Consider using --tmp-dir" ); + } +#else /* ifdef _WIN32 */ /* Non-windows platforms use $TMPDIR, and if not set, default to '/tmp' */ o->tmp_dir =getenv ("TMPDIR" );if (!o->tmp_dir)
src/openvpn/win32-util.c +22 -0
@@ -147,4 +147,26 @@ }return true; } + +const char * +win_get_tempdir (void ) +{ +static char tmpdir[MAX_PATH ]; +WCHAR wtmpdir[MAX_PATH ]; + +if (!GetTempPathW (_countof (wtmpdir), wtmpdir)) + { +return NULL ; + } + +if (WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 ,NULL ,0 ,NULL ,NULL ) >sizeof (tmpdir)) + { +msg (M_WARN ,"Could not get temporary directory. Path is too long." +" Consider using --tmp-dir" ); +return NULL ; + } + +WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 , tmpdir,sizeof (tmpdir),NULL ,NULL ); +return tmpdir; +}#endif /* _WIN32 */
src/openvpn/win32-util.h +3 -0
@@ -40,5 +40,8 @@/* return true if filename is safe to be used on Windows */ bool win_safe_filename (const char *fn); +/* Find temporary directory */ +const char *win_get_tempdir (void ); +#endif /* OPENVPN_WIN32_UTIL_H */ #endif /* ifdef _WIN32 */
src/openvpn/win32.c +0 -28
@@ -1137,34 +1137,6 @@set_win_sys_path (buf, es); } - -const char * -win_get_tempdir (void ) -{ -static char tmpdir[MAX_PATH ]; -WCHAR wtmpdir[MAX_PATH ]; - -if (!GetTempPathW (_countof (wtmpdir), wtmpdir)) - { -/* Warn if we can't find a valid temporary directory, which should -* be unlikely. -*/ -msg (M_WARN ,"Could not find a suitable temporary directory." -" (GetTempPath() failed). Consider using --tmp-dir" ); -return NULL ; - } - -if (WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 ,NULL ,0 ,NULL ,NULL ) >sizeof (tmpdir)) - { -msg (M_WARN ,"Could not get temporary directory. Path is too long." -" Consider using --tmp-dir" ); -return NULL ; - } - -WideCharToMultiByte (CP_UTF8 ,0 , wtmpdir,-1 , tmpdir,sizeof (tmpdir),NULL ,NULL ); -return tmpdir; -} -static bool win_block_dns_service (bool add,int index,const HANDLE pipe) {
src/openvpn/win32.h +0 -3
@@ -286,9 +286,6 @@/* call self in a subprocess */ void fork_to_self (const char *cmdline); -/* Find temporary directory */ -const char *win_get_tempdir (void ); -bool win_wfp_block_dns (const NET_IFINDEX index,const HANDLE msg_channel);bool win_wfp_uninit (const NET_IFINDEX index,const HANDLE msg_channel);
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/481?usp=email
To unsubscribe, or for help writing mail filters, visit http://gerrit.openvpn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: I525ccf7872880367b248ebebb0ddc83551498042
Gerrit-Change-Number: 481
Gerrit-PatchSet: 3
Gerrit-Owner: plaisthos <[email protected]...>
Gerrit-Reviewer: cron2 <[email protected]...>
Gerrit-Reviewer: flichtenheld <[email protected]...>
Gerrit-CC: openvpn-devel <[email protected]>
Gerrit-MessageType: merged